From 3e7279cff4cb1cd940a9ad22a5abf5fd4b3bfa43 Mon Sep 17 00:00:00 2001 From: Alexander Larsson Date: Mon, 25 Feb 2002 04:00:37 +0000 Subject: [PATCH] Always NULL out bg_pixmap, even when it used to be None or parent 2002-02-24 Alexander Larsson * gdk/x11/gdkwindow-x11.c (gdk_window_set_background): Always NULL out bg_pixmap, even when it used to be None or parent relative. --- ChangeLog | 6 ++++++ ChangeLog.pre-2-0 | 6 ++++++ ChangeLog.pre-2-10 | 6 ++++++ ChangeLog.pre-2-2 | 6 ++++++ ChangeLog.pre-2-4 | 6 ++++++ ChangeLog.pre-2-6 | 6 ++++++ ChangeLog.pre-2-8 | 6 ++++++ gdk/x11/gdkwindow-x11.c | 7 +++---- 8 files changed, 45 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index b69e42d6d1..6447bb3e89 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2002-02-24 Alexander Larsson + + * gdk/x11/gdkwindow-x11.c (gdk_window_set_background): + Always NULL out bg_pixmap, even when it used to be None + or parent relative. + 2002-02-24 Havoc Pennington * gtk/gtktextbuffer.c (parent_class): parent_class variable was diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index b69e42d6d1..6447bb3e89 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,9 @@ +2002-02-24 Alexander Larsson + + * gdk/x11/gdkwindow-x11.c (gdk_window_set_background): + Always NULL out bg_pixmap, even when it used to be None + or parent relative. + 2002-02-24 Havoc Pennington * gtk/gtktextbuffer.c (parent_class): parent_class variable was diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index b69e42d6d1..6447bb3e89 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,9 @@ +2002-02-24 Alexander Larsson + + * gdk/x11/gdkwindow-x11.c (gdk_window_set_background): + Always NULL out bg_pixmap, even when it used to be None + or parent relative. + 2002-02-24 Havoc Pennington * gtk/gtktextbuffer.c (parent_class): parent_class variable was diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index b69e42d6d1..6447bb3e89 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,9 @@ +2002-02-24 Alexander Larsson + + * gdk/x11/gdkwindow-x11.c (gdk_window_set_background): + Always NULL out bg_pixmap, even when it used to be None + or parent relative. + 2002-02-24 Havoc Pennington * gtk/gtktextbuffer.c (parent_class): parent_class variable was diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index b69e42d6d1..6447bb3e89 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,9 @@ +2002-02-24 Alexander Larsson + + * gdk/x11/gdkwindow-x11.c (gdk_window_set_background): + Always NULL out bg_pixmap, even when it used to be None + or parent relative. + 2002-02-24 Havoc Pennington * gtk/gtktextbuffer.c (parent_class): parent_class variable was diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index b69e42d6d1..6447bb3e89 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,9 @@ +2002-02-24 Alexander Larsson + + * gdk/x11/gdkwindow-x11.c (gdk_window_set_background): + Always NULL out bg_pixmap, even when it used to be None + or parent relative. + 2002-02-24 Havoc Pennington * gtk/gtktextbuffer.c (parent_class): parent_class variable was diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index b69e42d6d1..6447bb3e89 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,9 @@ +2002-02-24 Alexander Larsson + + * gdk/x11/gdkwindow-x11.c (gdk_window_set_background): + Always NULL out bg_pixmap, even when it used to be None + or parent relative. + 2002-02-24 Havoc Pennington * gtk/gtktextbuffer.c (parent_class): parent_class variable was diff --git a/gdk/x11/gdkwindow-x11.c b/gdk/x11/gdkwindow-x11.c index 3c5d2ee408..37de3ff28a 100644 --- a/gdk/x11/gdkwindow-x11.c +++ b/gdk/x11/gdkwindow-x11.c @@ -1961,10 +1961,9 @@ gdk_window_set_background (GdkWindow *window, if (private->bg_pixmap && private->bg_pixmap != GDK_PARENT_RELATIVE_BG && private->bg_pixmap != GDK_NO_BG) - { - gdk_pixmap_unref (private->bg_pixmap); - private->bg_pixmap = NULL; - } + gdk_pixmap_unref (private->bg_pixmap); + + private->bg_pixmap = NULL; } /** -- 2.30.2